More reorganization and modifications to spice content