updating assignments 6 & 7