Updated with sample data