add close and keypad support