modified goal_finder for better control