renaming and tweaking