#289 - more updates