Final changes labb 2