Updated Controller, still some errors...