Code review 13.04.2014 part two