to do: masking and incl more measures. datasink broken.