Added goals for final app