Goal 3 and Updated Goal 1