Added MY_Controller, plus some changes