One thing I should add is that particularly when using a single tank, make sure the tank is tilted back slightly when at the flying attitude. This will make sure you pick up the last of the fuel on your last few circuits before landing.

John