trying to fix the changename/dupe bug