Update after @staabm comments