Lab7 final changes