Updated for SSL