E:41722 [*] Small design changes