Change some conditions