More work on encryption and decryption