applying changes for v2.1.0