Design change

Changed design