changed the search conditions a little and added a barycenter for points..