Adds the --state parameter to both types. With it, the transition between both types can be done smothly.
matze