renaming and small alterations