Integrator and masker updated and can now be compiled