adapt to use new stuff

Original commit message from CVS:
adapt to use new stuff
2 files changed