rewritten some logic of Store Trackers, there were several issues