Simulator class edits