Updated SPXRest