-. timeperiod refactoring