Updated to run on externally-visible server