Genesis speed up (10/36)

Genesis speed up