Changed config, aligned source