Update to encryption to match exact specification (Still doesn't work)