integrated yelp, removed corner cases