Code changes on proxynova