forgotten some simplifications