done some part of changes with AST