Change logic for minor edits
Merge branch 'staging'