Consolidated the visibility condition for future updates, if needed