Tweaked segment organization