adding proxy wrapper and other stuff