rev 18 updated