matching algo now works properly, up to chnages in eta/phi ~3%