I *think* this is the right thing.