still working on the refresh handling