worked in some small changes to original controller, modified controller is buggy