added indicator for sample count as well.