Change impl of ATS