updated expression templates