changes

made the package more generic