refactors on bz integration