Genesis speed up (11/36)

Genesis speed up