v.1.0.1 - design revisited