Encryption logic implemented 2.0