Modify code per feedback.