Making it work with api again.