Removed tracked change reference
Restructured for Encrypt and Sign