Added jj combo to avoid ESC