should be mass conserving now...