Updating code for release 2.1