Changes suggeted by wpoely86