Changes for version 2.2