conf headers changes
org conf adjusted