refactor.
No more refresh!