start to fix partitioning scheme