updated for working database and mobile service