Changes after lecture 6