settings refactored
merge settings