More SS updates