note to me, when I address Dave's review comments, fix this too.