improved overall design