Updated for NEAK S3 2.8x