Revert "Revert "Revert "Added Some Visibilty options"""

This reverts commit c0ad51e25ee4aece45d2aec8ae614af9294830de.