fix 1 design
design 2 fix