Update after @kimchy review