modify for packaging