Adapted to new ssvsj