Removing this for a better location
Adjust for base64