Changes after going over and comments.