WIP: check endpoint instead of data