11-26-2

revisions from nlf meeting