Sameenas edits above.  Scott's edits below