Some more design review