Miscellaneous

Upgraded to version 2.3