Major overhaul on visibility