Modified key tracking