changes to make ast more conform