Updated for NEAK S3 2.7x