Merge branch 'Trying-to-do-segmentds-before-anything-else'