Changes based on Alex's review.