removed conditions and them together