more work on strategy
improved partition system
merge