Tweaks to controller and turning around logic