config changes
merged with harsha's changes