be a little less conservative about the state of this code