Updated this design a bit