bug fix + finish proxy