modified MasterServerHandler