Fixed xml
Added task 6 implementation