View and Model updated so lab1 is now working correctly. No changes
compared to the not updated lab1 solved earlier.