Updated ROXY code from v1.6 to v1.7