Edits based on comments from Eric Stocker