Added changes from Rick's review.