Design
Some fix