Rebuild with some tweaks