Major update to base64