Improved refresh handling 2 - Needs testing