working on keyboard support