fixed all switches but introduced new issues