Tweaked the design a bit