added the encryption, merged in the items
added the encryption, merged in the items
added the encryption, merged in the items