SetGoals and the deprecated method call updates - tests still required