fixed dup names
wip