adjusted to work with current version of the package.