Update design Chapter 5