updated to Kate's spec. One more tweak to make.