added database, formatting