changed design a bit