Trying a variant of what I had earlier.