much improved match setup