a bit buggy
add xml