New time gen

Finalize and address Alex's comments.