Updated for version 2.2

Updated for version 2.2