switched to more final data/dom structure