Revised for new sample data