adapted to newest ssvuj