dshi_d_old is now dshi_d