use new BJ export functions to clean up BJ mode a lot
use new BJ export functions to clean up BJ mode a lot