Final edits to phase 1 and 2