Updated chapter5