removed loop / added xml element tags