Re-updated with latest add_item module fixes