Improved the overall design