Modify for initial deployment