Final changes labb 3.1