more changes from ast to sast