Final commit for the first peer assessment