changed config, included some conditions