updated to rev 10297