Creating some WaitingRoom helper functions
Solved conflicts