revamp endpoints