Edits based on meeting Jan 24th.