slight update. removed gcm entirely until later time