#257 - more updates