Some Design changes.