working on changes for name change