Some more design [#4]