modify controller as well