amending last merge with manual edits