working on speed and visualization
fixed merging issues