....xml bug...
resolved merge conflicts on master
algo working