- introduced compartments
 - changed tests accordingly