Updated with File Encryption