changed design a little