Updated with new sample data