Fixes failing user spec
Refactors list and segmentation check