review comments and add partitioner