Refined autonomous and toggle
Revert "Refined autonomous and toggle"

This reverts commit 50778e5ae1986f8619ea961330673dd3989dfdfd.