added revised S1F, S2F