Added visibility checker