a little rebuild