Updated Partitioner - Work In Progress