Edited up to section 3