updated for bii 2.0