updating proxing and id handling