removed separate controller