Changing the wrong coding that we did at the beginning S2G3 to S3G3