More edits by Zoab