Design changes (19/29)

Design changes