Works under partitions now
Merge branch 'feature-work-under-partitions'