Changes for version 2.1