rebuilt a bit