Fixing it up and rebuilding