- only encrypt the result
- added new keystore