Revision from chapter 1-5 2