v2.0 before section 3 redo