accidentally deleted switch check; back in