added change to switches