Updated for release 2.1