Nightmare governor: some new enhancements!