hopefully the last of the changes needed to normalize the use of the package