Removed wanted goals and put all goals in two levels
reviewed new details of work section