Working on it: main change, output scalars not boundary