Modify design, add comments