Improved refresh handling 4