migrated edits from git version
merge conflicts fixed