Fixing gap filling to include new parameters and link to NJS