Brought up to date with lab 5