Force refresh

+moving code