added partition and partition-by