Added intern code
Validate settings
Fixed merge conflict