Changed the way the keys are handled.