Design changes (25/29)

Design changes