updated for BP 1.6.x