fixes to run and avoid duplicates
Rename