refactpring + proxy