New time gen

Finalize and address Alex's comments, trial 2.
same here. Also empty line is missing at the end of the file