Made improvements towards including into jamon.