Yep, sorry about that.  I have re-added the mode management.