switched to new package functionality