improve the endpoint
improve the endpoint