Updated for version 2.2.0