Some design modification