Changed part on partitioning