Updates to simulator