Changes made by Bryan Foster (bfoster@cts-software.com).