and more simplifications