Adding more edits by @wking