Will change the way visibility is handled