Improved control method functions and changed switch testing logic
Merge branch 'master' of https://github.com/rhodeser/cockroach-sunset