Completed to section 4.2