Updated for NEAK S3 3.1x and NEAK Note2 2.0x