More tweaking of partitions