Put into list and better sample data