Adapted to newest sses
Adapted to newest sses