1. Critical keys as discussed need to be encrypted 2. Relevant changes to functions which use those keys need to be done.