Added segment enumeration
Revert "Added segment enumeration"

This reverts commit 8b59cf63acbeed5309205d60179f046f6ca43796.
Added multiblocks correction