Partition logic changed
-- testing done by Akshay