refactored the package