Removed Dependency on Localhost