Modified proxy - it was still severely broken