Few Design changes