more simplifications!