Changed code so that the expression wrapper is no longer needed