Updated for NEAK S3 2.2x