Final commit for 4th exercise