separated this method out from refresh