Fixed up the partitioning a bit