better config
changes for new config style