Makevars updated thanks to Prof Brian Ripley