More visibility modifications