added some conditions and config files