Refined design again