add some conditions