Changed Refresh Logic