minor changes and ecryption