Updated Partitioner again - Work In Progress