Updated for bbdkp 1.3.0.5