Edits by Kristi