Continuing work on bz_integration based on new specifications