Ba tracking (30/33)

Ba tracking