some change in Expr I forgot
merging changes