ready for BLond v1.6.0