Added keypad controls