Updated the controlled room protocol to fit more needs