Changed design a little