Updates for latest simulation code