Now using data from api