Added visibility functionality