Updated design
fixed merge conflict