Adapted to newest ssvuj and ssvu