modified entity and controller