improved KeyTracker