modified to use new entry points