Trying this rewrite one more time.