Removed the base controller - new plan works MUCH better!