timestamps & save refactoring