changed design and some data