Tighten up visibility