added timestamps feature, adjusted generation structure