MY_Controller tweaks