Updated properly for ACT and better selector for data