Made the controller more versitile (and actually work)