Many changes to conf