Modify design of stat part