improved switch base