fix tracking. add message after tracking.