[Chapter16] Updated