Make the end point make more sense