updated settings
merged changes