Feedback by @rafaeltorato