Tweaked the abstract controller