Ba tracking (32/33)

Ba tracking