Optimization: Added more controllers. Better code readability.