Nightmare governor: A little improvements!