Small, internal hhc optimization and new hhc build