Changes asked by yihui