added switch controlls and other such things