some refinements... no more base64