Changed AST and main