Revisions based on Task Force feedback 12/5