Committing solution for point_search