changes for time implementation