added cock switcher
merging disabled state