More editing, ready to submit to Greg