Controller Modification