Update to new visibility rules