Changes to gatesimulation