Changes to keypad methods