Adapted to newest ssvuj