comments only
migrating changes from hbfb39523e
tests passing with new hbf conventions