Leaf switches replaced by modern component