Changed encryption/decryption method