some additions and renaming