Changed controller structure