More change to SS and BodyScan