Fixing new Switch Setting Function