changes in variable names and congfig structure