Suspend Governor: complete code rewrite