More merging of my new config with old