adrianwmm changes