Coding changes for adding Bazz.