Update for S7