Segments fixed
Nightly commit with conditions