move this to other keys just like before