Updated for NEAK S3 2.4x