Updated to properly run with matchmaker