Maintenance & bug fixing by Philip Cole