Added generation, click events