Fixed up to section 2