Updated submission for peer assessment 1