Added controllers again