Merge waiting back in for multiplayer