Rebuild, v1.6