made changes needed to work with matchmaking code