Added encryption to addresses. And ordering.