Adapted to newest ssvuj
Updated to latest ssvuj