Added ESC handler