Finished addressing review comments.