Update for visibility overhaul