more elements, simplifications