working on endpoints