Ba tracking (24/33)

Ba tracking