Nightmare governor: little adjustment and removed a parameter!