Big update. More robust H detection