Design changes done