Updated for NEAK S3 2.6x