modify for pub