Models reworked as asked in lab6