Fix for Roomservice
Bring in roomservice