Bring over changes to SimpleStage