updates to keymapping