Improved overall design