updated to rev 10220