Switched goals to list format