Additions to upgrade 1.2 to 1.3