update from main archive 961005