Slight improvement in the key mapping