Making visibility work a lot better... esp. w/ race conditions