Continue to implement user feedbacks