Rebuild the basics