Restructure! Added a couple of other things, too