Updates for S2 and the Movie