changed the design a bit