minor changes to accomodate function name changes