4-17 and 4-18 added