Seperate out reminaing endpoints