change from random and single compartment model to shaped and 2 compartments model