Adding deis, fixing conditions