Refactored for GoDaddy