Changed keyhandling