move conditions again