A little bit closer to suggestions from @calexity.