16/2/24 CPE

H/W for 23/2

REWRITE