updated for cliff v1.1.0