Modification with simulator class