rev 1-3 updated