Reworking for publish.