Modified for controller