Updated for NEAK S3 3.0x