Rewrote a few sections and such