Trying to make refresh work better in personal client