Update after @spinscale review