Changed controller stuff