A bit better design.