#952 Endpoint (untested yet)