added goal 1 & 2