fixed b64, added s1q2