removed version checks + keyType