Better key tracking