changed to match new config
new config options