Take in account @nelsonsilva feedbacks