Comments from pablo romero (@promerof)