Major revision in response to Dave's comments via email