updated to rev 10942