Finalized iniial version of proxy