modified Endpoint + test