Ernesto/Rebecca - using new endpoints for data