Better mapping for my speedy fingers