updated for newer versions of packages