Re-applied Daniel's switch barriers.