update from main archive 961114