Add rewrite of matchmaking ready code