changing some conditions