package handling commented out