Changes in demo/jjmTools.R