added in a timer for generation
fixing merge conflict