Ba tracking (10/33)

Ba tracking