Adapted to newest ssvu (WIP)