Little improving of design