Code review 25 Nov 2013