better matching w/ less junk!