More amendments to allow for different number of compartments
Working at this point