AST updated for the desired functionality