Changes for controller