Updated with same changes as knitr file