SJ -  a lot of updates