Some edits suggested by abrar