re #768 - Improved sample data