Updating usage pattern of sample tracker

More usage updates