Updated to version 2.1.1 and CB version 1.7.9