More compartments!