Draft 35 + pdd