Reworked for keyboard actions only