updated method to be s2f