Ba tracking (31/33)

Ba tracking