rev 4-7 updated
rev 7 fixed