Genesis speed up (16/36)

Genesis speed up