Edits for Shymika and Danny