Merged section 4 into 2.2 and cleaned up 2.1 as section 2.