improve keybinding again