add more sample checks