modified some conditions