Refactored, updated controllers