Update after @drapergeek s comments