repercuted changes to simulator code