Changes to setup (following Yihui)