Revert "Revert "updated edits and adds""

This reverts commit 8789726f52f403326c197c4924b19a09125cc852.