final edits as per Ray.