First attempt at updating for hsbencher 1.8