Changed design a bit(beta)