Update after @bleskes review