Edited Section 2.1-2.4