Tweak per Chris' comments.