Better simulator
Changes simulator class again