Moved to using controllers