Changed visibility logic