refactor + new feature: refresh of the data