Update to work with HBN