Updated for NEAK S3 3.1.1x