Same intent as previous commit, except closer to the original ast