Comments from Leonardo Rodriguez (@leoxi)