changed design, added database