Updating for multiple sites
Fixing merge conflicts