change definitions to eliminate Hborings.