Goals added and goal class rewritten