Changed controller functionality