Added alignment + segmentation