adjusted some tools to changes in HWRT