added D_all and D_ratio