code review 11/13 - do not merge