Added logic for bazz