Updated for rev 1.3