Continued refactoring temporal functions