Removed partitioning; not flexible enough