refactored time to look like all other modules