Finish Chapter 02
some mistake