Add goal to jared problems (cherry-picked from stable).