Track more S3 devices and added S4 devices