Updated for release 1.1