Trying to fix expression constructor issue
merge conflict resolved