ready for bj
2nd merge of ready-for-bj