Changed (not fully) visions to be one-by-one