merge. added xml time structure changed