work on database and API