Make visibility more restrict