tweaked rebuild.