Add Goals
fix goals