Updated helper (fixed db i think), some xml