Impoving design

Improving design