Design changes

Design changes