add BB retesting part