changed structure, added HBD