Update for jembe2 and GCM