Updated for sharing & embedding