Adapted to new SSVMS