Adapted to newest SSVS, cleanup, WIP new level