Improved the design a little