Improved the design