Chapter05 updates