upgrade to HAPI 2.2