Shadia's edits from my computer