Removed todo
Adapted to newest ssvuj