updated to rev 10836