update from main archive 961215