Proposed structural changes for encrypt.