Final commit week 3