put back in some statepoint coding