introducing initial refreshing + refactoring