refactored encryption back into claims