I don't like this method and think it should go away, but in a different change.