Adapted to newest sses