Added more code for section 2.1