Sped up matching and added yosemite as dataset