Edited to the end of section 3