final rev 1.6