Added more density estimation