zehra's partial edits