Refactored how Surl is calculated