updated design and structure