I'll look at doing that. Is 16 really enough? That corresponds to the number of partitions.