adding switch to fields