Changed key generation. En/decrypt works