Changes as per feedback.