database, app, GPS added