update from main archive 961010