Improve after feedbacks