Change #goal_between to a scope