reverted to generic packaging method