Design patern change & text update.