Updated to meet new Controller