Attempts to fix refresh issues.. Not complete