few changes and renaming