Reflects changes discussed on Friday 12/5/14