moved conditions again