This also came from @alexatallbeer review coming soon