Full draft except for density estimation