Some changes for feedback.